]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
Revert "keyboard: Handle touch events"
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 1 Sep 2014 19:22:36 +0000 (21:22 +0200)
committerCarlos Garnacho <carlosg@gnome.org>
Mon, 1 Sep 2014 19:33:04 +0000 (21:33 +0200)
This reverts commit a84fb99c0aca9fd6eeb83a270c48113133e89de2.

This commit didn't make the OSK fully operational yet on Wayland, and
caused the double emission of key events on X11 due to the OSK keys
receiving first touch events from the passive touch grab, and then
emulated pointer events from event selection after the touch sequence
was rejected in the grab.

When we make a better effort at handling touch events just once on X11,
this commit can be reapplied and remaining wayland OSK support resumed
from there. In the mean time, this patch is better reverted.

https://bugzilla.gnome.org/show_bug.cgi?id=735681

js/ui/keyboard.js

index 3805fb0b7c3acbcc8a4c5c0860d71e8eb8808ccf..cfce8614238578082c545b2d97d455d918182da7 100644 (file)
@@ -90,25 +90,6 @@ const Key = new Lang.Class({
                 key.release();
                 return Clutter.EVENT_PROPAGATE;
             }));
-        button.connect('touch-event', Lang.bind(this,
-            function (actor, event) {
-                let device = event.get_device();
-                let sequence = event.get_event_sequence();
-
-                if (!this._touchPressed &&
-                    event.type() == Clutter.EventType.TOUCH_BEGIN) {
-                    device.sequence_grab(sequence, actor);
-                    this._touchPressed = true;
-                    key.press();
-                } else if (this._touchPressed &&
-                           event.type() == Clutter.EventType.TOUCH_END &&
-                           device.sequence_get_grabbed_actor(sequence) == actor) {
-                    device.sequence_ungrab(sequence);
-                    this._touchPressed = false;
-                    key.release();
-                }
-                return Clutter.EVENT_PROPAGATE;
-            }));
 
         return button;
     },